[AUTO-CHERRYPICK] [AutoPR- Security] Patch telegraf for CVE-2026-56852 [HIGH] - branch 3.0-dev - #18257
Open
CBL-Mariner-Bot wants to merge 3 commits into
Open
[AUTO-CHERRYPICK] [AutoPR- Security] Patch telegraf for CVE-2026-56852 [HIGH] - branch 3.0-dev#18257CBL-Mariner-Bot wants to merge 3 commits into
CBL-Mariner-Bot wants to merge 3 commits into
Conversation
(cherry picked from commit 0f81265)
CBL-Mariner-Bot
added
the
Auto Fast-track Cherry-pick
microsoft-github-policy-service
Bot
added
Packaging
3.0-dev
CBL-Mariner-Bot
marked this pull request as ready for review
July 30, 2026 01:01
Collaborator
Author
|
All conflicts resolved. |
Collaborator
Author
Auto Cherry-Pick SPEC Validation Summary
|
| Source (fasttrack) | Target (3.0-dev) | Resolved | |
|---|---|---|---|
| Version | 1.31.0 | 1.31.0 | None |
| Release | 25 | 26 | 27 |
| Patches | 53 | 55 | 56 |
| Conflict | Yes |
- Version-release None-27 is not higher than Source 1.31.0-25
- Version-release None-27 is not higher than Target 1.31.0-26
- Duplicate changelog entry for 1.31.0-23 (appears 2 times)
- Duplicate changelog entry for 1.31.0-22 (appears 2 times)
- Changelog out of order: 1.31.0-22 appears before 1.31.0-23
- Directive present in both Source and Target was dropped: BuildRequires: golang
- Directive present in both Source and Target was dropped: BuildRequires: systemd-devel
12 tasks
The auto-cherry-pick AI resolver left several corruptions in the telegraf.spec merge for CVE-2026-56852: - Stripped the spec header (Summary, Name, Version, License, Vendor, Distribution), leaving only Release - Dropped BuildRequires: golang and BuildRequires: systemd-devel - Dropped %dir %{_sysconfdir}/%{name}/telegraf.d from %files - Inserted a blank line at the top of %changelog and misplaced the section header - Duplicated the -22 and -23 changelog entries This commit rebuilds the SPEC from 3.0-dev's canonical head and applies the fasttrack CVE-2026-56852 change per playbook rules: - Release 26 -> 27 - Patch53 slot preserved for CVE-2026-56852 (fasttrack canonical) - 3.0-dev-only patches renumbered up: 29923/46327/54908 -> 54/55/56 - Fasttrack changelog entry (-25, Jul 28) preserved verbatim - 3.0-dev-only changelog entries renumbered up (-26/-27) and dates bumped to Jul 30 so they are not older than the fasttrack -25 entry Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 26b18818-c4ef-43b9-ad6c-26bbf7c5259e
Collaborator
|
[Toolio Iglesias🗺️] Pushed a corrective commit (6d1646e) fixing the auto-cherry-pick artifacts left by the AI conflict resolver:
Also re-applied the fasttrack cherry-pick rules cleanly:
CI should re-run. Ready for review /cc @cblmargh |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is an auto-generated pull request to cherry-pick commit 0f81265 to 3.0-dev. Original PR: #18237
In case of no merge conflicts, the PR is merged without approval because it's an automated cherry-pick of an already approved PR.
In case of merge conflicts, an AI-based conflict resolver will attempt to resolve conflicts and might make mistakes. The reviewer must check AI's work before approving.